Make fill-region-as-paragraph respect the fill-column

Add 0019-fill-region-as-paragraph-should-better-respect-the-f.patch.

Thanks to Nobuhiro IMAI <nov@yo.rim.or.jp> for reporting the problem
and tracking down the relevant patch.

Closes: 539634

diff --cc debian/.git-dpm
index 774ccf0896b21a8e86bd3fca865dcaec66bf0378,0000000000000000000000000000000000000000..b565b2fe75d0c215644098adf639364ed828a190
mode 100644,000000..100644
--- 1/debian/.git-dpm
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
- 85d33a4f8d5153229502b8d690eaf60146b69468
- 85d33a4f8d5153229502b8d690eaf60146b69468
 +# see git-dpm(1) from git-dpm package
++79b09b9067bac0f0f3076a72cf066b630217c83e
++79b09b9067bac0f0f3076a72cf066b630217c83e
 +24c1fe67725d87a843919696fdc1ff49c99e7fd4
 +24c1fe67725d87a843919696fdc1ff49c99e7fd4
 +emacs24_24.3+1.orig.tar.bz2
 +421a2aef37aedf8ca24bb57cd100d173022e79a4
 +25725234

diff --cc debian/patches/0019-fill-region-as-paragraph-should-better-respect-the-f.patch
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..941d25bbae9d7fe9599c39fdad84f4c5b0aba501
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/0019-fill-region-as-paragraph-should-better-respect-the-f.patch
@@@ -1,0 -1,0 +1,51 @@@
++From 79b09b9067bac0f0f3076a72cf066b630217c83e Mon Sep 17 00:00:00 2001
++From: Toru TSUNEYOSHI <t_tuneyosi@hotmail.com>
++Date: Fri, 30 Nov 2012 15:10:30 +0800
++Subject: fill-region-as-paragraph should better respect the fill-column
++
++This upstream patch has been added:
++
++  * textmodes/fill.el (fill-region-as-paragraph): Handle overshoot by move-to-column.
++
++Origin: upstream, commit: r111035, 0483a4f3930f62a0b4d05402c71fa734c6258b8a
++Bug: http://debbugs.gnu.org/3234
++Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=539634
++Added-by: Rob Browning <rlb@defaultvalue.org>
++---
++ lisp/ChangeLog         | 5 +++++
++ lisp/textmodes/fill.el | 6 +++++-
++ 2 files changed, 10 insertions(+), 1 deletion(-)
++
++diff --git a/lisp/ChangeLog b/lisp/ChangeLog
++index 01b4a02..8a90261 100644
++--- a/lisp/ChangeLog
+++++ b/lisp/ChangeLog
++@@ -508,6 +508,11 @@
++      * files.el (dir-locals-read-from-file): Check file non-empty
++      before reading.  (Bug#13038)
++ 
+++2012-11-30  Toru TSUNEYOSHI  <t_tuneyosi@hotmail.com>
+++
+++     * textmodes/fill.el (fill-region-as-paragraph): Handle overshoot
+++     by move-to-column (Bug#3234).
+++
++ 2012-11-28  Glenn Morris  <rgm@gnu.org>
++ 
++      * jka-cmpr-hook.el (jka-compr-get-compression-info):
++diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
++index feb2fa6..5b6d5f3 100644
++--- a/lisp/textmodes/fill.el
+++++ b/lisp/textmodes/fill.el
++@@ -721,7 +721,11 @@ space does not end a sentence, so don't break a line there."
++          (move-to-column (current-fill-column))
++          (if (when (< (point) to)
++                ;; Find the position where we'll break the line.
++-               (forward-char 1) ;Use an immediately following space, if any.
+++               ;; Use an immediately following space, if any.
+++               ;; However, note that `move-to-column' may overshoot
+++               ;; if there are wide characters (Bug#3234).
+++               (unless (> (current-column) (current-fill-column))
+++                 (forward-char 1))
++                (fill-move-to-break-point linebeg)
++                ;; Check again to see if we got to the end of
++                ;; the paragraph.

diff --cc debian/patches/series
index ebfd89e26c8e0e37c1e8b9d702dc016cf31d9444,0000000000000000000000000000000000000000..1f600bf3655cc9413d45e6315341f08b4fcd66fc
mode 100644,000000..100644
--- 1/debian/patches/series
--- /dev/null
+++ b/debian/patches/series
@@@ -1,18 -1,0 +1,19 @@@
 +0001-Prefer-usr-share-info-emacs-24-over-usr-share-info.patch
 +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
 +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
 +0004-Adjust-documentation-references-for-Debian.patch
 +0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch
 +0006-Look-for-NEWS-in-order-to-find-etc-rather-than-GNU.patch
 +0007-Invoke-the-correct-xmlstarlet-executable-on-Debian-s.patch
 +0008-Emacs-should-no-longer-hang-at-startup-on-kFreeBSD.patch
 +0009-Emacs-should-no-longer-hang-at-startup-on-kFreeBSD.patch
 +0010-Emacs-should-now-build-correctly-on-GNU-Hurd.patch
 +0011-Gnus-should-no-longer-use-a-predictable-temp-file-na.patch
 +0012-Security-issues-in-find-gc.el-have-been-fixed-CVE-20.patch
 +0013-Security-issues-in-tramp-have-been-fixed-CVE-2014-34.patch
 +0014-Insecure-file-handling-in-browse-url-mosaic-has-been.patch
 +0015-The-compose-key-should-now-work-better-with-UIM-1-4.patch
 +0016-The-compose-key-should-now-work-better-with-UIM-2-4.patch
 +0017-The-compose-key-should-now-work-better-with-UIM-3-4.patch
 +0018-The-compose-key-should-now-work-better-with-UIM-4-4.patch
++0019-fill-region-as-paragraph-should-better-respect-the-f.patch